issue #539 fixed (again)