Fix a nasty, nasty, NASTY bug :(