Applied the fix on another place