WP-883 bug/feature added