Fixed #1029844