Fixed issue 32.