Tk 874

Fixes #874