Fixed issue 8