Fixed #364