Added guard
Fix specs