Fixing D-10926