Sawhat : fixed auto_loading