fixed duplicate classes