issue #507, issue #508