[PATCH] Bug #679