Correction for issue 171