Implement hack to avoid UI throwing this error