Fixed #1218