Function name change to 'workaround'