Fixed #1144