Fix image too few issue for some cases