Fixed gaurd.
Added starting position buffer.