fix class detection done on the wrong screen