WP-1894: adjust positioning.