Fix for proper loading precedence