2 Fix scaffold