Finally fix twitter