Fixed #969