Tk798

Fixes: tk #798