Attempt for a fix for #143.