Rebuild [Fixes #159]