Add guard for easy TDD