fix return value and avoid unnecessary extra conditional