--oaa fix

Creating this pull for now just to see the automatic tests.

Let's wait to merge on the forum posts.