Fix ambiguous handler