Fix delayed return handling mechanism