Fix for tsobject