See line #4468, better to place it in the same block?