Attempted fix on the class-none bug.