Fixed issue 9