´Bugfix: Walk over my dead body