Fixed a problem with a conditional and the ID