Fixed issue 26