#118 - Fixed Tataree