Don't do premature updates, close #48