Set to false as default to investigate bug