fixed bug with expanding 'class ClassName'