Added in fix for Vector classes.