diff --git a/arch/ioapic.h b/arch/ioapic.h
index 33e5e36..4ee4830 100644
--- a/arch/ioapic.h
+++ b/arch/ioapic.h
@@ -57,7 +57,7 @@ void config(uint8_t slot, Core::Interrupt::Vector vector,
  *  To fully enable interrupt handling, the interrupts must be enabled for every
  * CPU (e.g., by calling
  *  \ref Core::Interrupt::enable() in main).
- *  \todo(12) Do that somewhere appropriate.
+ *  \todo Do that somewhere appropriate.
  *
  *  \param slot Number of the external interrupt that should be enabled.
  *
diff --git a/main.cc b/main.cc
index c25e180..aa0ad01 100644
--- a/main.cc
+++ b/main.cc
@@ -112,6 +112,8 @@ extern "C" int main() {
   ApplicationProcessor::boot();
   
   PS2Controller::init();
+  Core::Interrupt:enable()
+
   Key key = Key();
   while (true){
     if (PS2Controller::fetch(key)) {
@@ -125,6 +127,7 @@ extern "C" int main() {
 extern "C" int main_ap() {
   DBG_VERBOSE << "CPU core " << static_cast<int>(Core::getID()) << " / LAPIC "
               << static_cast<int>(LAPIC::getID()) << " in main_ap()" << endl;
+  Core::Interrupt:enable()