Fix a nasty issue