Fix/multiple class