fix issues #259 and #261