Fixed issue 18.