fix: avoid losing use
during incremental build
#425
+109
−30
Merged