fixed problem with includes and partial loading