Attempting a fix for #59.