Moved back to back log - change breaks a few things so internals needs a bit of a refactor. This bug is also present on JS Functions implementation