Iron out C3 dependency