fixing bundle key change issues