Temporary fix for Oregon's problems