fixed class conflict