Loading possibly fixed

Needs further testing