Bugfix/merge mismatch

Fixes #27