fix return value issue