Issue 66 - part 3

Fix oval-sc, too.