fix guard and handler pointers