Remove very serious bug discovered by AO =)