Replace with the one from 1.6.4