Student scaffolding works

Fixed the bug