Another fine tuning for bounces, fixes #1.