Ronnie: fix merge mistake