Fix a critical bug....