Temporary commit to try to figure out if the applied fix can lead to weird issues.