Fixing Stock Scaffolding