Fixed issues in script for combining-class