Re-added guard