fix no arg/return address handling