Fix issue #1 to fit the new HTML