Fix for DS-1614