bugfix - proper guard removal