Fixes with guard