Ran in to a scoping bug, this should not be needed anymore. Fixing