Major bugfix in Visual Input
merge