Fix for [DF-593].