SUP-2094 partial fix