Redirect AND return. Fix #206