generic parameter
resolving correction
correction resovling vars from blocks
fixed issue when second class with the same name disappears