Again fixing issue 205