Fixed issue 22.