[PATCH 08/11] Bug fix.