fixed the waterfall issue