Adding TS for issue #90