Fix and test case for MODE-1824