scaffold bug fix