Fixed #376