Fixing a bug in event to variable mapping.