Removed TODO as forge bug was fixed.