Fixed #943