rebuild. Fixes #590
speedy loader