Fixed #2153