Fixed issues detecting tricks