Fixed obsolete class