Fixed #1112