Fixed #1030