[PATCH] Fix "return" target handling