Fix binding of <return>