Another fix for broken merge