Fixex bug from boilerplate