Fixed issue 87.