Adding commented code to avoid doubles see BT#8982