Assure highlatable is takein into account

This is the same fix as #803, but does not depend on another PR to work. We want to have it in tomorrows deploy, that's why it was taken out of #803.

This should solve #727