attempt to fix incorrect event namespacing