Fixed guard-spork issue