Merge "Fixing triple buffer bug"