Fix #279