Attempt at fix for #72