Fix Visualization behaviour