fix sun loading bug, with Johnathan
I <3 merge conflicts