issue #535
issue #531