Minor fix to issue 28