trying to fix loading issues