Fixes streak off by one errors