Fixed dependency loading issue