Add/remove access bugfix (closes #93 and closes #94)