Fixing a bug introduced when switching to "methods" over "context"