FIX: Only need to check if str