bugfix for common header issue #71