Fix load implementation