Added guard for testing