Fixed #781