Fix % 0 problem again