Hopeful fix for FB 5423