Production and Development compatibility fix.