Update for oC6. Fix #2