Created a ticket and added a todo here