FIX: Removed unnecessary str conversion