Fixed #1194