Merge "Fix stupid bug." into oc-dev