Cebe notes fixes #18