Fixed loader issues