Custom load method logic fix