Need to fix this version temporarily in order to be able to release a new version of itself without the ShortTypeHandling problem