Production.rb fix by SOF