Fix #218, drain events