FDP-1956: Confirm it works on load