DF-4918 decomposition fix