fixed classname matching