GitHub #14 - Fix map for autoloader