merge fix from hash.so