Fixed #343