Remove debug output and add little fix