Fixed issue 4