Quick merge problem fix.