Extend unhappy workaround for language-java