Attempt to fix V210 issues