Fixed #1023