Updated fix for Working set too