Fixing TODO message.