Fix for UI issue #68 T2h00
Fix for UI issue #68 T2h00