Fixing issue with mapping events to commands
Fixing issue with mapping events to commands
Fixing issue with mapping events to commands