Fixed a bug with the Remove command