Fix #244 once again