Fix for load to server