waterfall bug fixed