Fixed issue 6