Fix with bouncing bug