Event listeners small fix. Work in progress.