Fixed #771