Added flag to prevent any bounces