Add class:type
Try to fix parser