Fix issue with jdk8 and InternalState