Corrections to Scaffolds
Fixed Issue #17