Feature/prevent baptism problem