fixed loaded issues