fixed a merge problem
???
fixed a -1 bug