Added in workaround for all D columns