Mark EG & Chrissi: Fix