fix #351 (again)