classes filters fixed TC-17