Fixing up long builds

Amazing what happens when you reset a class level variable on each init.