Improved wave bounding control