Solved the last non-chat FIXME.