Intermediate fix