Additonal change for #28