Fixed #1069