Fixed #1063