Fixes: contextSelector