Fix for viewing