Fixed up for release