#6 fixed dependencies to inner classes