deck off-by-one fix, position past end fix