Fixes #4649, #4758

See https://github.com/Baystation12/Baystation12/issues/4649, https://github.com/Baystation12/Baystation12/issues/4758