XVM rev2956 - may still be broken