Fix: calling selector on wrong class
Merge branch 'vanyas-fix-wrong-class-calling'