fixes on remove
[fix] closes #1