Fix for endless reloads

Fix for endless reloads