Tk 1058

Fixes #1057 
Fixes #1058