First shot at a fix for no default format