Fixed #363