Fixed chinooks not taking sub cells into account

Fixes #6068 & #4605
This logic isn't very clear.  Could you add a comment explaining what this is doing?