and wouldn't the same string check be needed here?