Fixed issue 90.