Fixed bug in previous change