Fixing problem with workflow automatically advancing when it should not