Fixed issue 15