Added guard for auto-reload :octopus: