fixed bug where events werent passed through correctly