Untested version for 1.7.2