Added fix for setting modals correctly when still setting up