Fixed #545