Fix for selection mechanizm