Made manifest checking more stringent