If this works, I won't have to use the to do partial. Fixes #1 Task #4305568537754