maybe this will fix the loading bug?