#732: Rebuild