Fix for development environment