Fixed #779