DAR-1496: Using this instead of e.target