Fixed #340