Temp fix for viewing