Fix for unstable merge