Fix a hot issue