fix from earlier merge issue