Resolved issue with funky scope workarounds