Re-added this got removed by accident.
Missed this keycatcher reference.