Open source transition complete, fix #2