I fixed it in CoreDriver as well