ch2 bug fixes

#487 and #485