Fixed handling of load