7c342e75bf
This needs to be changed everwhere in the code because isinstance will match derived types where == will not