Better fix to issue 161 - also fixes display on event detail