Fixed the triangle issue with #1265