fixes for ch8