Try to fix JS data fetch