changes to fix issue #197 (again)