Fix for autoreload issues