Tk 985

Fixes #985