Fixed #778