[-] Fix for firefox, event object is not passed correctly
Merge branch 'fix'