reporoduced #539 with test
(*) CTL-539 Fixed