make the /return forms actually work, fixes #18