Reenabled fix to see if it causes break