+con #16141 One remaining small fix to better support Java compatibility