issue #536