Fixes Context leaks