Added on pull #2259