Fixed #1243