fixed dub classes