Fix issue with auto loading