bug fix - Issue -434