Fixed an issue with the previous added feature