Fix issue with common.h