final strong class fix!