Fixed issue 17