Initial fix for issue 61 (logged on PPD issue list)