Fixed issue 449