Now using DCJ's cleaner fix