Fix double loading
a first stab a little responsiveness