Fixed a problem due to renaming class