Fix #25 again, because the last fix made other bug