Fixed #1138