Fixed bouncer behaviour