Fixed #966