Fix scaffold