Fixing Curent Article Bug by simplifying logic