fixed loader issues