I'm sure this can be done more elegantly with signals.
Then again, due to the nature of the bug fixes I'm going to merge this immediately.