Fixed up for spec