Fixed #2612