Fix for kwhd issue
Fix for kwhd issue