Fix #258