Attempt to fix 15828