Bounce handling bug issue 226

#226 GO!GO!GO!GO!GO!