BUG FIX: no need to -1 now