Created by: DrCelt
Fixes #11409 (closed) and anything else with an occupant variable that didn't handle this