fixed bouncing bug
fixed bouncing bug conflict