Resolved in refactored version.