Fix issue #2: matchClass throwing errors for remote api