bugfix to pass 'last' correctly to return handler