slightly better returner behaviour