Solve the reproducing old result issue because of order of operation

Fix to solve the reproducing issue due to order of operation.