Fixing Waterfall mode