Class declaration fix