Fix for CLI build with specified suffix.