Fixed issue at first load