fix issue where some code got overrided, making selectors for offset not work