fix for earlier merge