Closed #38 - "no return" is no longer an issue