Some Fix for wh