Oscap source

bugfix again, probably shouldn't be in this branch.