Fix bug with reload classes when using guard