Fix for compound name