Fixed issue 16