Fix the same issue as in master (scaffolding problem)