temp fix for eventview bug