Fix problem of wrong image size in waterfall