Fix for some nasty behaviour I noticed yesterday