DEV ENV fix, first attempt