Double location

Fixes #188 #189