Proper fix for r8963