Filed as #178