One more attempt to fix the shared scheme