fixes #1595
fix removing tasks