v1 fix in production