nail down for version 3.1