patching up to new HTC source (42e6c45)