Added temporary handling for let