fix loading, take 2