Switched to evervolv htc-common