Fixed #1099