Fixed Issue with Cyclic header references