Removed TODO fixed in my fork