attempting to fix problems in issue #531 still