More robust outline handling