Fix combo problem + firmware 1.01