Fixed issue 3