fix class-brick-mapping