Hopefully last 1.6.4 update