Changed setup to be correct