Add triple buffering fix ( Test )