Ide 1825

We need to remove this .bak from the commit.