Fix problem with double class definition