Fixed #2605