Rebuilt latest sources