Trying to work around issue that led to internal error