Some fix, and create new Bundle