Updated to work with latest source (018b).