Fixed #387