make it work without hack&patch