Scaffold fix