Important change from bug fix didn't commit. :P