Patch bug #2