Fix #1, remove meaningless if