Fixes https://github.com/octobercms/october/issues/4223, https://github.com/octobercms/october/issues/4226. Credit to @w20k.