Fix for duplicate class definition introduced in  ddcfcf7.