Fixed #543