fix to include correct classes