fix

add guard block
minor changes