update to fix loading bug