Newly found issue and a fix for that issue