Workaround: fixed wrong merge