Auto-loader fixed