Upgrade to 1.9 comp