reenabled and fixed distribution to target mapping