Fixed #1013