Fixed fatal bug in previous commit