Fix for #4649
Merge pull request #4762 from mwerezak/holotable

Fixes #4649