COMP: fix for issue 3494