attempt to fix shallow fetch