fix guard 1.1 issues