Fix for misuse of "inner" class.