Fixing 231 class