Fix automatic reload & NaNs