Changed to 1.6.4 versions, need to test