Bugfix. This should work across two branches.