Fixed issue 2