Reverted to non-fixed header to remove issues