Build: Prevent a possible overlap during export