Fix for the bootstrap sample

Fix for Bootstrap sample which is failing unit tests.