Fixed #1155