Fixed issue from Ticket 39 (http://www.tukui.org/tickets/duffedui/index.php?page=bug_show&bug_id=39)