Fixed #256. Still needs player though.