Add a special case for fname arguments