Add/Remove Bug Fix