Development mode fix