Fixed issue for dev environments