Update for new camera workaround