#528 add guard check