Fixed #2303