Fixed nasty blooper with returns