fixed scaffolds and bootstrap bug