Fix a hidden bug