Fixing muliple classes