Updated bug in guard
Fixed initializer
Does this help the tests?