Loading order bug fix