Fixed issue 439