Attempt to fix load order