Fix waterfall load problem #114