CodeNight Fix #1