WP-1893: adjust positioning.