Fixed so that we can run test