Fixed issues with stopping event propogation