#259 fixed