Fixed chinooks not taking sub cells into account

Fixes #6068 & #4605
Style nit: no explicit privates, please.