Fixed #2244