Fixed #349