Fix #616

RIP main-Conversation, 2012-2014