Shape TK 1.9.1

Bug fixes