fixed use of Guard
merged back