Add self-check (source protected)
Fix self-check