Fix a weird bug that is present since v1.0