Fixed gendot and merged in changes from v1.64