ADD: Added scaffolders to detect the bug.