TSXGL fixed with wait
Merge