bugs solved related to inner classes