HOTFIX: Fix $(this) problem after refactoring because of changing scope