Fixed fold and deal bug