Merged @fruchtose: Resolving viadeo issues for #366