Manually applying fix by @rarila.