fixes and closes issue#259