Applied proposed fix