Change: fix for auto loader.