Extra buffering in pieceMap eliminated