Fix use-with issue #508