DEV environment fix