move fixes to v1