Fix #222: second attempt using runtime listener
6 files changed