post master-merge fixes. Looks a little odd.
More bugfix, but I don't like this one.