Fix issue from earlier merge