Const cert fix