added little hack for loader