fixing #543