Fixed #1219