Tk 986

Fixes #986