Not quite all the way fixed