Fixed #313