cleaning up potential loading issues