let amvault take care about this