Fix waterfalling