Fixed issue 3.