added production check