Fixing TODO