fixing some load issues