fix scaffolding 2