Fix for 2-1 location death

Fixes #165.