Fix #259