fixes #DC-185
fixes #DC-984