Fix bug #15  from livestreet