fix return related