Custom version for use by 1.3.7