Fixed the waterfall issue