Fix veirfier retrieval