Designer fixes