Tk 790

Fixes #790