Added workaround to force correct geometry