Fixed CBC, closes #27