Quick fix before merge