Fixed Bouncer issue