Fix #354 (again)