Fixed #542