Fixed issue 5