Fix UI issue #68 T:0h30