Fix for Amy's event