Fixed issue from changelog merge