fix bugs since changed header