(#1681) - Dont assume change will complete in less than a second