Bugfix: add missing header check