Fixed issue 1