Fixed #1198