Fixed bug in common header