Fixed #362