Fixed production issue