Fix missing remove listener (Should fix #280 - not reproducible yet)