Fixes for (#3441).
Merge pull request #3454 from Menshin/canhold_overlook

Fixes for #3441.