updated to work with 1.6.4