Fix unsafe condition...