Fixed issue 6.