Fixed #776