really fixed another patch conflict