Fix noempty bug