Potential fix for #128
Potential fix for #129.