Fix end channel calc for certain cases

Fixed end channel calculation for custom models and when individual
start channels is checked.