Fixed issue 18