Fix C21 COM disabling when using prev/next buttons