[BUGFIX] Use correct value for remove function