FIX: wrong class checks