20140618 - OS/OW Resolution Fix