Fixed Scaffolding Issue