Updated from 1.6.4