fixed rebuild