Quick fix last merge