Fixing earlier merge issue