Make changes as LubosRemplik fork.