First work on issue #508