rollback fix_empty_channels method