Patching up little bug