#43 Final patch besides the hash discrepency