better local bounce handling