Fixed problem with scaffolding