Minor merge problem, fix.