Fixed headers positions update bug fixed
(cherry picked from commit c47749f)
(cherry picked from commit 1eb7f6b)