Another fix for #63