Fixed #2204