Fix before merge