TT Bug Fix