WIP: bug still here .. seems to be scope related