Fixed #1157