Fixed front-loading issue