Added an option to disable hash checking