Issue#89 Fix variable usage again