Fixing the resource issue... I think