Ramigg fix merge