DATA-1504 follow-up, quickfix.