update changes, fixes #633 and #639