Class checker - Performance tweak by Xon