Final fix for dev_mode