Oops, fixing the issue that was supposed to be fixed in last commit