Additonal change for #28

Additonal change for #28