Fixed event listeners definitions