Adding fix for visualization problem