Potential fix for #40