Additional change for #99