Fix for HTC's mess