Fixed issue 19