a workaround commit (still hashjoin not working...)