Empty-string argument fix