Fix double reloads - fixed #15