Quick fix to last merge