Attempt at fix for #103