Fixed issue 22