Another fix for #745 without extra table. Best that can be done with the current html structure I think.