Fix for WHOX etc.